Skip to content

1.x: fix merge/flatMap crashing on an inner scalar of null#3809

Merged
akarnokd merged 1 commit intoReactiveX:1.xfrom
akarnokd:MergeNullScalarFix1x
Mar 29, 2016
Merged

1.x: fix merge/flatMap crashing on an inner scalar of null#3809
akarnokd merged 1 commit intoReactiveX:1.xfrom
akarnokd:MergeNullScalarFix1x

Conversation

@akarnokd
Copy link
Member

This crash happens on contention where a scalar null value has to go through the scalar-queue which doesn't support nulls and requires NotificationLite transformations. (The drain side had the proper getValue in place already.)

Reported in #3808.

@artem-zinnatullin
Copy link
Contributor

👍

@akarnokd akarnokd force-pushed the MergeNullScalarFix1x branch from c34d341 to 47eb306 Compare March 29, 2016 15:33
@akarnokd
Copy link
Member Author

Wrong test, didn't trigger the code path that goes into the queue. Updated.

@artem-zinnatullin
Copy link
Contributor

👍

// New rule: check all PRs locally…

@zsxwing
Copy link
Member

zsxwing commented Mar 29, 2016

👍

@akarnokd akarnokd merged commit 08f5860 into ReactiveX:1.x Mar 29, 2016
@akarnokd akarnokd deleted the MergeNullScalarFix1x branch March 29, 2016 20:00
@stevegury
Copy link
Member

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants